Angel
|
a3cbb726f1
|
Merge remote-tracking branch 'origin/develop' into develop
|
10 months ago |
|
Angel
|
43af7a16f6
|
1.JcjJjxxTask 和 AlarmInfoTask 会冲突，注销JcjJjxxTask
2. 修改XXXService.update的语法错误
|
10 months ago |
hanrenchun
|
6cb1e9f03b
|
处警数据新增字段
|
10 months ago |
|
hanrenchun
|
a3cae3ee78
|
处警数据清洗
|
10 months ago |
|
Angel
|
9ad736dfdb
|
实有单位 ，监控设备，实有房屋，实有地址 的 修改...集成MP
|
10 months ago |
|
Angel
|
2fdcbb7759
|
接警信息Task
|
10 months ago |
|
hanrenchun
|
09cdd8ee92
|
test
|
10 months ago |
|
hanrenchun
|
f58313262e
|
test
|
10 months ago |
|
hanrenchun
|
2faa402827
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# config/application.properties
|
10 months ago |
|
hanrenchun
|
2b29010906
|
重点人员清洗
|
10 months ago |
|
Angel
|
36bf450e64
|
Du SYDW TEst
|
10 months ago |
|
Angel
|
fc3ae1662f
|
Du SYDW TEst
|
10 months ago |
|
hanrenchun
|
d8b1663d26
|
test
|
10 months ago |
|
hanrenchun
|
d7260291fb
|
从业人员,接警信息的调整
|
10 months ago |
|
Angel
|
1f32b259bc
|
Merge remote-tracking branch 'origin/develop' into develop
|
10 months ago |
|
Angel
|
5c008bd048
|
Sydw和JJXX 两张表
|
10 months ago |
|
hanrenchun
|
02a560a8b9
|
重点人员
|
10 months ago |
|
Angel
|
290561b8ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
10 months ago |
|
Angel
|
51e4fe039d
|
Jjxx的表,还有mapper.xml的优化Bug
|
10 months ago |
|
hanrenchun
|
b80f6b6390
|
处警信息
|
10 months ago |
|
Angel
|
2da4e4972d
|
（xml文件大小写冲突）---修改
|
10 months ago |
|
hanrenchun
|
56b8681c6d
|
Merge remote-tracking branch 'origin/develop' into develop
|
10 months ago |
|
hanrenchun
|
e7c78f3064
|
出警信息
|
10 months ago |
|
Angel
|
8a5a702b15
|
（Oracle前缀）---修改
|
10 months ago |
fengchunyu
|
4c8f5dab0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
10 months ago |
|
Angel
|
e4f5c01193
|
（监控设备OracleMapper.xml）---修改
|
10 months ago |
|
fengchunyu
|
7213655f85
|
bug修复
|
10 months ago |
|
Angel
|
2a2d2cf5eb
|
实有房屋）---修改
|
10 months ago |
|
Angel
|
23fd1e11a6
|
t_jksbgl(监控设备）---修改
|
10 months ago |
|
Angel
|
237b7a8c31
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# config/application.properties
# src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java
# src/main/resources/application.yml
|
10 months ago |
|
Angel
|
3fb16b0de7
|
t_jksbgl(监控设备）
|
10 months ago |
|
hanrenchun
|
20252d3f74
|
实有人口
|
10 months ago |
|
hanrenchun
|
98a5f4ddd5
|
实有人口
|
10 months ago |
|
Angel
|
811b4ea864
|
实有房屋
|
10 months ago |
|
Angel
|
f2f9c9def8
|
测试
|
10 months ago |
|
fengchunyu
|
7cfc06e5d8
|
配置初始化
|
10 months ago |
cyFeng
|
a5bfbf3624
|
first commit
|
10 months ago |
