Commit b6c497c5 authored by lixiaofang's avatar lixiaofang

add

parent 40a2c20d
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/trans2es/models/pictorial.py" beforeDir="false" afterPath="$PROJECT_DIR$/trans2es/models/pictorial.py" afterDir="false" />
</list>
<list default="true" id="d7dd36ca-85ef-4a59-9db5-8b1ee4993a4e" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -77,13 +75,13 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="json" value="42" />
<entry key="py" value="329" />
<entry key="py" value="345" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JSON" value="42" />
<entry key="Python" value="329" />
<entry key="Python" value="345" />
</counts>
</usages-collector>
</session>
......@@ -93,8 +91,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/trans2es/models/pictorial.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="245">
<caret line="87" lean-forward="true" selection-start-line="62" selection-start-column="20" selection-end-line="87" />
<state relative-caret-position="722">
<caret line="76" column="21" selection-start-line="76" selection-start-column="21" selection-end-line="76" selection-end-column="21" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
......@@ -114,7 +112,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/utils/pictorial_transfer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<state relative-caret-position="510">
<caret line="38" column="25" lean-forward="true" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
<folding>
<element signature="e#46#55#0" expanded="true" />
......@@ -126,8 +124,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2445">
<caret line="336" column="27" selection-start-line="336" selection-start-column="18" selection-end-line="336" selection-end-column="27" />
<state relative-caret-position="228">
<caret line="253" column="4" selection-start-line="253" selection-start-column="4" selection-end-line="253" selection-end-column="4" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
......@@ -138,8 +136,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="129" column="42" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" />
<state relative-caret-position="242">
<caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
<folding>
<element signature="e#1025#1811#0" />
<element signature="e#1850#3438#0" />
......@@ -336,6 +334,7 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="724" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18114798" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
......@@ -350,7 +349,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32840723" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
......@@ -480,51 +479,51 @@
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_mapping2es.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<entry file="file://$PROJECT_DIR$/trans2es/models/topic.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="129" column="42" selection-start-line="129" selection-start-column="42" selection-end-line="129" selection-end-column="42" />
<folding>
<element signature="e#1025#1811#0" />
<element signature="e#1850#3438#0" />
<element signature="e#1917#3438#0" />
<element signature="e#5182#8141#0" />
<element signature="e#8191#9199#0" />
</folding>
<state relative-caret-position="181">
<caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/type_info.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2445">
<caret line="336" column="27" selection-start-line="336" selection-start-column="18" selection-end-line="336" selection-end-column="27" />
<state relative-caret-position="228">
<caret line="253" column="4" selection-start-line="253" selection-start-column="4" selection-end-line="253" selection-end-column="4" />
<folding>
<element signature="e#15#87#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/utils/pictorial_transfer.py">
<entry file="file://$PROJECT_DIR$/trans2es/management/commands/trans2es_data2es_parallel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="38" column="25" lean-forward="true" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
<state relative-caret-position="242">
<caret line="115" column="34" selection-start-line="115" selection-start-column="34" selection-end-line="115" selection-end-column="34" />
<folding>
<element signature="e#46#55#0" expanded="true" />
<element signature="e#1025#1811#0" />
<element signature="e#1850#3438#0" />
<element signature="e#1917#3438#0" />
<element signature="e#5182#8141#0" />
<element signature="e#8191#9199#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/topic.py">
<entry file="file://$PROJECT_DIR$/trans2es/utils/pictorial_transfer.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
<caret line="18" column="27" lean-forward="true" selection-start-line="18" selection-start-column="27" selection-end-line="18" selection-end-column="27" />
<state relative-caret-position="510">
<caret line="38" column="25" lean-forward="true" selection-start-line="38" selection-start-column="25" selection-end-line="38" selection-end-column="25" />
<folding>
<element signature="e#46#55#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/trans2es/models/pictorial.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="245">
<caret line="87" lean-forward="true" selection-start-line="62" selection-start-column="20" selection-end-line="87" />
<state relative-caret-position="722">
<caret line="76" column="21" selection-start-line="76" selection-start-column="21" selection-end-line="76" selection-end-column="21" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
......
......@@ -54,7 +54,6 @@ class Pictorial(models.Model):
name = models.CharField(verbose_name=u'画报名称', max_length=100)
description = models.CharField(verbose_name=u'画报描述', max_length=200)
creator_id = models.BigIntegerField(verbose_name=u'画报用户ID')
pictorial_id = models.IntegerField(verbose_name=u'画报ID')
user_id = models.IntegerField(verbose_name=u'用户ID')
icon = models.CharField(verbose_name=u'画报名称', max_length=255)
topic_num = models.IntegerField(verbose_name=u'次数')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment